$OpenBSD: patch-lib_puppet_defaults_rb,v 1.3 2016/08/30 12:09:07 jasper Exp $
--- lib/puppet/defaults.rb.orig	Tue Aug 23 19:23:03 2016
+++ lib/puppet/defaults.rb	Mon Aug 29 19:57:39 2016
@@ -1110,11 +1110,11 @@ EOT
 
   define_settings(:master,
     :user => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The user puppet master should run as.",
     },
     :group => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The group puppet master should run as.",
     },
     :default_manifest => {
@@ -1207,7 +1207,7 @@ EOT
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
+      :default => "$codedir/modules#{File::PATH_SEPARATOR}/var/puppetlabs/puppet/modules",
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
